*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5f3b91fefb98bf32791e199a60fe9a10829119c9..558af5fab0b8e1cb272349d133ed4a5ab95f1a5f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-10  Eli Zaretskii  <eliz@gnu.org>
+
+       * international/mule-cmds.el (set-locale-environment): Fix last
+       change for when the locale's preferences don't specify any
+       encoding.
+
 2006-04-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * emacs-lisp/find-func.el (find-function-search-for-symbol): Fix regexp

diff --git a/src/ChangeLog b/src/ChangeLog
index ab26fb9a4c8c33dbfd661a084fe859ede26af84d..bd557cd0b169770f922238c207fd927b171598c4 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-10  Eli Zaretskii  <eliz@gnu.org>
+
+       * s/ms-w32.h (pid_t) [_MSC_VER]: New typedef.
+
 2006-04-10  Romain Francoise  <romain@orebokech.com>
 
        * xrdb.c (gethomedir): Use xstrdup.